gtkpopover: Move away from gdk_device_get_state()
authorCarlos Garnacho <carlosg@gnome.org>
Tue, 28 Jul 2020 13:44:09 +0000 (15:44 +0200)
committerCarlos Garnacho <carlosg@gnome.org>
Tue, 28 Jul 2020 15:36:18 +0000 (17:36 +0200)
Use gdk_device_get_modifier_state() poking the keyboard and keymap,
instead of this function.

gtk/gtkpopover.c

index 62ae3c902a11c750be9337ad4ecd76228bb3d10b..d77d225a1e484094009a5ed6b86ddd7d35cbfe89 100644 (file)
@@ -602,7 +602,6 @@ close_menu (GtkPopover *popover)
 static gboolean
 gtk_popover_has_mnemonic_modifier_pressed (GtkPopover *popover)
 {
-  GtkPopoverPrivate *priv = gtk_popover_get_instance_private (popover);
   GList *seats, *s;
   gboolean retval = FALSE;
 
@@ -610,10 +609,10 @@ gtk_popover_has_mnemonic_modifier_pressed (GtkPopover *popover)
 
   for (s = seats; s; s = s->next)
     {
-      GdkDevice *dev = gdk_seat_get_pointer (s->data);
+      GdkDevice *dev = gdk_seat_get_keyboard (s->data);
       GdkModifierType mask;
 
-      gdk_device_get_state (dev, priv->surface, NULL, &mask);
+      mask = gdk_device_get_modifier_state (dev);
       if ((mask & gtk_accelerator_get_default_mod_mask ()) == GDK_ALT_MASK)
         {
           retval = TRUE;